Merge from trunk
authorJan D. <jan.h.d@swipnet.se>
Mon, 8 Mar 2010 12:05:51 +0000 (13:05 +0100)
committerJan D. <jan.h.d@swipnet.se>
Mon, 8 Mar 2010 12:05:51 +0000 (13:05 +0100)

Trivial merge